Skip to content

Conversation

@breskeby
Copy link
Contributor

No description provided.

@breskeby breskeby requested a review from a team as a code owner April 30, 2025 12:00
@breskeby breskeby added :Delivery/Build Build or test infrastructure Team:Delivery Meta label for Delivery team auto-backport Automatically create backport pull requests when merged v8.19.0 v9.1.0 labels Apr 30, 2025
@breskeby breskeby self-assigned this Apr 30, 2025
@elasticsearchmachine
Copy link
Collaborator

Pinging @elastic/es-delivery (Team:Delivery)

Copy link
Contributor

@jozala jozala left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@breskeby breskeby removed the v9.0.1 label Apr 30, 2025
@breskeby breskeby merged commit aa30951 into elastic:main Apr 30, 2025
17 checks passed
@elasticsearchmachine
Copy link
Collaborator

💔 Backport failed

Status Branch Result
8.19 Commit could not be cherrypicked due to conflicts

You can use sqren/backport to manually backport by running backport --upstream elastic/elasticsearch --pr 127561

@breskeby
Copy link
Contributor Author

💚 All backports created successfully

Status Branch Result
8.19

Questions ?

Please refer to the Backport tool documentation

breskeby added a commit to breskeby/elasticsearch that referenced this pull request Apr 30, 2025
(cherry picked from commit aa30951)

# Conflicts:
#	build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/DockerBase.java
#	distribution/docker/src/docker/Dockerfile
breskeby added a commit to breskeby/elasticsearch that referenced this pull request May 2, 2025
(cherry picked from commit aa30951)

# Conflicts:
#	build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/DockerBase.java
#	distribution/docker/src/docker/Dockerfile
elasticsearchmachine pushed a commit that referenced this pull request May 2, 2025
* Rename docker fips image to cloud-ess-fips (#127561)

(cherry picked from commit aa30951)

# Conflicts:
#	build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/DockerBase.java
#	distribution/docker/src/docker/Dockerfile

* Fix typo
breskeby added a commit to breskeby/elasticsearch that referenced this pull request May 20, 2025
(cherry picked from commit aa30951)

# Conflicts:
#	distribution/docker/cloud-ess-fips-docker-aarch64-export/build.gradle
#	distribution/docker/fips-docker-aarch64-export/build.gradle
#	server/src/main/java/org/elasticsearch/common/util/Countable.java
#	settings.gradle
@breskeby
Copy link
Contributor Author

💚 All backports created successfully

Status Branch Result
9.0

Questions ?

Please refer to the Backport tool documentation

breskeby added a commit that referenced this pull request May 20, 2025
* Rename docker fips image to cloud-ess-fips (#127561)

(cherry picked from commit aa30951)

# Conflicts:
#	distribution/docker/cloud-ess-fips-docker-aarch64-export/build.gradle
#	distribution/docker/fips-docker-aarch64-export/build.gradle
#	server/src/main/java/org/elasticsearch/common/util/Countable.java
#	settings.gradle

* Fix backport merge
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

auto-backport Automatically create backport pull requests when merged backport pending :Delivery/Build Build or test infrastructure >non-issue Team:Delivery Meta label for Delivery team v8.19.0 v9.1.0

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants